diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix new file mode 100644 index 00000000000..0ec33d1a759 --- /dev/null +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchsvn, autoconf, automake}: + +stdenv.mkDerivation { + name = "disnix-activation-scripts-nixos"; + src = fetchsvn { + url = https://svn.nixos.org/repos/nix/disnix/disnix-activation-scripts-nixos/trunk; + sha256 = "3ba44fbd2c00da6dd1926513184db89c1f3557c55af5c3a4041e85fb6d1a5758"; + }; + buildInputs = [ autoconf automake ]; + preConfigure = "./bootstrap"; +} diff --git a/pkgs/tools/package-management/disnix/activation-scripts/result b/pkgs/tools/package-management/disnix/activation-scripts/result new file mode 120000 index 00000000000..24a18e0ff7f --- /dev/null +++ b/pkgs/tools/package-management/disnix/activation-scripts/result @@ -0,0 +1 @@ +/nix/store/a9vc52wxfsyy1f84vr66h9hayfgwna37-disnix-activation-scripts-nixos \ No newline at end of file diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 32266f38b55..10113d04a78 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, dbus_glib, openssl, libxml2}: stdenv.mkDerivation { - name = "disnix-test"; + name = "disnix"; src = fetchsvn { url = https://svn.nixos.org/repos/nix/disnix/disnix/trunk; sha256 = "4397dc0bf4b4ecca795784d0011eb631538b17bd81e77b84bf15d89bf85e94bb"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be60ff7e313..33d06aadaee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8009,6 +8009,10 @@ let disnix = import ../tools/package-management/disnix { inherit stdenv fetchsvn openssl autoconf automake libtool pkgconfig dbus_glib libxml2; }; + + disnix_activation_scripts = import ../tools/package-management/disnix/activation-scripts { + inherit stdenv fetchsvn autoconf automake; + }; DisnixService = import ../tools/package-management/disnix/DisnixService { inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix;