Merge pull request #71586 from Lassulus/writers
writers: fix writeC & tests
This commit is contained in:
commit
f417dd9c89
|
@ -92,13 +92,15 @@ rec {
|
||||||
PATH=${makeBinPath [
|
PATH=${makeBinPath [
|
||||||
pkgs.binutils-unwrapped
|
pkgs.binutils-unwrapped
|
||||||
pkgs.coreutils
|
pkgs.coreutils
|
||||||
|
pkgs.findutils
|
||||||
pkgs.gcc
|
pkgs.gcc
|
||||||
pkgs.pkgconfig
|
pkgs.pkgconfig
|
||||||
]}
|
]}
|
||||||
|
export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries}
|
||||||
gcc \
|
gcc \
|
||||||
${optionalString (libraries != [])
|
${optionalString (libraries != [])
|
||||||
"$(pkg-config --cflags --libs ${
|
"$(pkg-config --cflags --libs ${
|
||||||
concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgsconfig -name \*.pc -exec basename {} \;)") libraries
|
concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries
|
||||||
})"
|
})"
|
||||||
} \
|
} \
|
||||||
-O \
|
-O \
|
||||||
|
|
|
@ -1,4 +1,16 @@
|
||||||
{ stdenv, lib, runCommand, haskellPackages, nodePackages, perlPackages, python2Packages, python3Packages, writers, writeText }:
|
{
|
||||||
|
glib,
|
||||||
|
haskellPackages,
|
||||||
|
lib,
|
||||||
|
nodePackages,
|
||||||
|
perlPackages,
|
||||||
|
python2Packages,
|
||||||
|
python3Packages,
|
||||||
|
runCommand,
|
||||||
|
stdenv,
|
||||||
|
writers,
|
||||||
|
writeText
|
||||||
|
}:
|
||||||
with writers;
|
with writers;
|
||||||
let
|
let
|
||||||
|
|
||||||
|
@ -49,9 +61,11 @@ let
|
||||||
python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } ''
|
python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } ''
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
class Test(Enum):
|
class Test(Enum):
|
||||||
a = "success"
|
a = "success"
|
||||||
|
|
||||||
|
|
||||||
print Test.a
|
print Test.a
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -70,9 +84,19 @@ let
|
||||||
if [[ "test" == "test" ]]; then echo "success"; fi
|
if [[ "test" == "test" ]]; then echo "success"; fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
c = writeC "test_c" { libraries = [ ]; } ''
|
c = writeC "test_c" { libraries = [ glib.dev ]; } ''
|
||||||
|
#include <gio/gio.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
int main() {
|
int main() {
|
||||||
|
GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE);
|
||||||
|
g_application_register (application, NULL, NULL);
|
||||||
|
GNotification *notification = g_notification_new ("Hello world!");
|
||||||
|
g_notification_set_body (notification, "This is an example notification.");
|
||||||
|
GIcon *icon = g_themed_icon_new ("dialog-information");
|
||||||
|
g_notification_set_icon (notification, icon);
|
||||||
|
g_object_unref (icon);
|
||||||
|
g_object_unref (notification);
|
||||||
|
g_object_unref (application);
|
||||||
printf("success\n");
|
printf("success\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -112,9 +136,11 @@ let
|
||||||
python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } ''
|
python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } ''
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
class Test(Enum):
|
class Test(Enum):
|
||||||
a = "success"
|
a = "success"
|
||||||
|
|
||||||
|
|
||||||
print Test.a
|
print Test.a
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue